bitkeeper revision 1.1159.273.1 (423c8bfeCXSFg6Xv58QRFeh4HYLpOQ)

Add MMC and Infiniband devices to XenLinux driver configuration
options.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers
index 93db5f9df6dcf834de01f6400f6f9466a45892d2..8158f26fd0dd9b60716ff6e56261d0cc743648ea 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers
+++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers
@@ -44,6 +44,8 @@ source "drivers/media/Kconfig"
 source "drivers/video/Kconfig"
 source "sound/Kconfig"
 source "drivers/usb/Kconfig"
+source "drivers/mmc/Kconfig"
+source "drivers/infiniband/Kconfig"
 endif
 
 if !XEN_PHYSDEV_ACCESS

diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
index 2cd0df626224bb52661a3f604340143146b2a279..cdfb09fecf4738f53057ebed0d1767e9162c5703 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -887,6 +887,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # CONFIG_USB_GADGET is not set
 
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
 #
 # File systems
 #